From 034da54d6cd1bd59866915d392c57734808c6e1a Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 15 Dec 2000 03:10:44 +0000 Subject: [PATCH] (read-face-attribute): If there's no entry for the user's input in VALID, just use it as-is (this will often result in an error, but it may be OK for e.g. colors using hexadecimal notation, and at least will yield a better error message). --- lisp/faces.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index 9821be07362..36bc0a48dc7 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -923,13 +923,14 @@ of a global face. Value is the new attribute value." ;; Terminal frames can support colors that don't appear ;; explicitly in VALID, using color approximation code ;; in tty-colors.el. - (if (and (memq attribute '(:foreground :background)) - (not (memq window-system '(x w32 mac))) - (not (member new-value - '("unspecified" - "unspecified-fg" "unspecified-bg")))) + (when (and (memq attribute '(:foreground :background)) + (not (memq window-system '(x w32 mac))) + (not (member new-value + '("unspecified" + "unspecified-fg" "unspecified-bg")))) (setq new-value (car (tty-color-desc new-value frame)))) - (setq new-value (cdr (assoc new-value valid)))))) + (when (assoc new-value valid) + (setq new-value (cdr (assoc new-value valid))))))) ((eq valid 'integerp) (setq new-value (face-read-integer face old-value attribute-name))) (t (error "Internal error"))) -- 2.30.2